From: Tom Hughes <tom@compton.nu>
Date: Wed, 28 Jul 2021 08:57:49 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/3274'
X-Git-Tag: live~2565
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/7e14ecbc28b5a29e5f0b34da7295610b4fff2bdf?hp=baee0b9a90764287059682604c5d57feee67a364

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