From: Tom Hughes <tom@compton.nu>
Date: Wed, 30 Mar 2022 17:00:00 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/3518'
X-Git-Tag: live~1312
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/8364fa6eb69efef66e532b3f5d48363b5db8611b?hp=5c2cb9e96fdc00c7efd72ba4186308127e45855c

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