From: Tom Hughes <tom@compton.nu>
Date: Wed, 15 Mar 2017 14:22:59 +0000 (+0000)
Subject: Merge remote-tracking branch 'openstreetmap/pull/1488'
X-Git-Tag: live~3477
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/8ccd7364cda55f247f2aa8c622466facd3f4fa65?ds=sidebyside

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

8ccd7364cda55f247f2aa8c622466facd3f4fa65