From: Tom Hughes <tom@compton.nu>
Date: Wed, 16 Jun 2021 17:01:43 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/3222'
X-Git-Tag: live~2525
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/0d55497fca147a83ec6fb03885605a7b8e34239c?hp=408c883d24af1d32b60a18bc0a5b1e5fdae30d53

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