From: Tom Hughes <tom@compton.nu>
Date: Wed, 7 Apr 2021 15:44:06 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/3166'
X-Git-Tag: live~1637
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/2d111c0f34613779bb730f1d0a823fa48e9d8439

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

2d111c0f34613779bb730f1d0a823fa48e9d8439