From: Tom Hughes <tom@compton.nu>
Date: Wed, 18 Aug 2021 14:12:43 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/3296'
X-Git-Tag: live~1540
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/6efc77b4732a2e2068894ee27e1c5ff35050e030?hp=--cc

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

6efc77b4732a2e2068894ee27e1c5ff35050e030