From: Tom Hughes <tom@compton.nu>
Date: Wed, 17 Aug 2016 07:24:28 +0000 (+0100)
Subject: Merge remote-tracking branch 'openstreetmap/pull/1270'
X-Git-Tag: live~3951
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/5ad17c1068c3f52e0b45b2884ee30b9a34e6de73?ds=sidebyside;hp=5ad17c1068c3f52e0b45b2884ee30b9a34e6de73

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