From: Tom Hughes <tom@compton.nu>
Date: Sat, 19 Jun 2021 13:45:23 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/3227'
X-Git-Tag: live~2590
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/11cf957460523b97aaa1ec110f4901fbce099321?hp=44fe2417b81f1c178ced98abff623f1e5374f1d1

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