From: Tom Hughes <tom@compton.nu>
Date: Wed, 9 Jun 2021 16:46:45 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/3217'
X-Git-Tag: live~2525
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/3fff377b009ea751bbfc106f079e7a73db8bffb2?hp=3fff377b009ea751bbfc106f079e7a73db8bffb2

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