From: Tom Hughes <tom@compton.nu>
Date: Mon, 6 Mar 2017 17:54:26 +0000 (+0000)
Subject: Merge remote-tracking branch 'openstreetmap/pull/1477'
X-Git-Tag: live~3532
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/49c3af4a32b38eaebdd9f819bf288a9b80495c12?ds=sidebyside

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

49c3af4a32b38eaebdd9f819bf288a9b80495c12