From: Tom Hughes <tom@compton.nu>
Date: Fri, 5 Mar 2021 15:50:34 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/3118'
X-Git-Tag: live~2727
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/6538f49994396628ad36717aae4e8da4160542cc?hp=d16c4667ed61418f0785f82eaad508655c6c6c7a

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