From: Tom Hughes <tom@compton.nu>
Date: Wed, 28 Oct 2020 11:29:57 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2918' into master
X-Git-Tag: live~1830
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/93e49daee21b64f0af0ba7fa3035904843a028ea

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

93e49daee21b64f0af0ba7fa3035904843a028ea