From: Tom Hughes <tom@compton.nu>
Date: Wed, 17 Mar 2021 15:56:27 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/3137'
X-Git-Tag: live~2746
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/12db71157afcc3612cdc269e3185e00b3e857eed?hp=0d313a9e03b11eae940e41896166b1487203bedf

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