From: Tom Hughes <tom@compton.nu>
Date: Tue, 28 Aug 2018 16:59:46 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/1950'
X-Git-Tag: live~2925
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/1dfbd9282c3b863ab2bf5b6a68f68195ba377851

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

1dfbd9282c3b863ab2bf5b6a68f68195ba377851