From: Tom Hughes <tom@compton.nu>
Date: Mon, 10 Sep 2018 18:09:31 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/1987'
X-Git-Tag: live~4296
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/297b0a0e166bab17cc6555deeefaf328f202bd72?hp=297b0a0e166bab17cc6555deeefaf328f202bd72

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