From: Tom Hughes <tom@compton.nu>
Date: Sun, 15 Aug 2021 10:15:23 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/3294'
X-Git-Tag: live~1583
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/495fd0e3331a2535b0bb1df8b352f27ce4f7c582?hp=-c

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

495fd0e3331a2535b0bb1df8b352f27ce4f7c582