From: Tom Hughes <tom@compton.nu>
Date: Thu, 20 Jun 2019 17:58:38 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2270'
X-Git-Tag: live~2552
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/80427b3e5e5ebeecbc0a57a1549a2a33e0c92199

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

80427b3e5e5ebeecbc0a57a1549a2a33e0c92199