From: Tom Hughes <tom@compton.nu>
Date: Tue, 8 Dec 2020 15:30:59 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2997' into master
X-Git-Tag: live~2342
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/fec3b35762cab056611590702f03d27ef8d3914f

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

fec3b35762cab056611590702f03d27ef8d3914f