From: Tom Hughes <tom@compton.nu>
Date: Wed, 15 Mar 2017 17:37:13 +0000 (+0000)
Subject: Merge remote-tracking branch 'openstreetmap/pull/1491'
X-Git-Tag: live~3512
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/671467a6ddfac77183c9af83abb119a849aa5e95?hp=--cc

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

671467a6ddfac77183c9af83abb119a849aa5e95