From: Tom Hughes <tom@compton.nu>
Date: Sat, 29 Oct 2016 15:26:16 +0000 (+0100)
Subject: Merge remote-tracking branch 'openstreetmap/pull/1348'
X-Git-Tag: live~4766
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/d478f94239ece371d6b14ce5e51adfbf7393073f?ds=sidebyside;hp=--cc

Merge remote-tracking branch 'openstreetmap/pull/1348'
---

d478f94239ece371d6b14ce5e51adfbf7393073f