From: Tom Hughes <tom@compton.nu>
Date: Fri, 4 Jun 2021 20:09:26 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/3212'
X-Git-Tag: live~1667
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/c233f6cb83c17d763eb119dacba32ded54ba988e?hp=ff877321e7bf364f5bac5901e113d107b5c2899e

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