From: Tom Hughes <tom@compton.nu>
Date: Wed, 29 Aug 2018 07:43:08 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/1960'
X-Git-Tag: live~2864
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/5bc8abbe059ca72187277830e10d89f73858a580

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

5bc8abbe059ca72187277830e10d89f73858a580