From: Tom Hughes <tom@compton.nu>
Date: Wed, 24 Mar 2021 21:14:41 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/3152'
X-Git-Tag: live~1701
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/cd99ff26fd3ba039c418e9d23dfcf4bf57a4f970?hp=bb2afc3e8b4e4a7faeb44344ebaead2617b727f1

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