From: Tom Hughes <tom@compton.nu>
Date: Tue, 7 Jul 2020 09:41:34 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2693'
X-Git-Tag: live~2805
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/1ea946636b7828ffa079b2461d87728f8dba863b?ds=sidebyside;hp=-c

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

1ea946636b7828ffa079b2461d87728f8dba863b