From: Tom Hughes <tom@compton.nu>
Date: Mon, 26 Jul 2021 18:11:08 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/3270'
X-Git-Tag: live~1467
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/b6780370a9b2ea851fab72692e18f3834ebcfa04?hp=-c

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

b6780370a9b2ea851fab72692e18f3834ebcfa04