From: Tom Hughes <tom@compton.nu>
Date: Sun, 5 Mar 2017 10:34:23 +0000 (+0000)
Subject: Merge remote-tracking branch 'openstreetmap/pull/1437'
X-Git-Tag: live~3565
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/b954416a70fb167b9cae0a3937de16bd9a93d239

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

b954416a70fb167b9cae0a3937de16bd9a93d239