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

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

71f2b6d1cd3fce606af65e04cff988cc59159282