From: Tom Hughes <tom@compton.nu>
Date: Wed, 17 May 2017 19:37:01 +0000 (+0100)
Subject: Merge remote-tracking branch 'openstreetmap/pull/1521'
X-Git-Tag: live~3461
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/6e5240e1987a429e29d230e811af9176772a8228

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

6e5240e1987a429e29d230e811af9176772a8228