From: Tom Hughes <tom@compton.nu>
Date: Thu, 6 Jul 2017 18:15:55 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/1575'
X-Git-Tag: live~4448
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/d4a461dc26ce20d2ae806f126c0b43a7214d2156?hp=d4a461dc26ce20d2ae806f126c0b43a7214d2156

Merge remote-tracking branch 'upstream/pull/1575'
---