From: Tom Hughes <tom@compton.nu>
Date: Tue, 3 Nov 2020 19:19:28 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2931' into master
X-Git-Tag: live~1929
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/984ba584ea20432e31146935596dbeb9bdd8eed2

Merge remote-tracking branch 'upstream/pull/2931' into master
---

984ba584ea20432e31146935596dbeb9bdd8eed2