From: Tom Hughes <tom@compton.nu>
Date: Wed, 16 Jun 2021 17:06:40 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/3225'
X-Git-Tag: live~1537
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/086f31f291f1646fda292ca838784cccc61a75ad?hp=086f31f291f1646fda292ca838784cccc61a75ad

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