From: Tom Hughes <tom@compton.nu>
Date: Wed, 6 Jan 2021 14:19:34 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/3038'
X-Git-Tag: live~2847
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/1303ba8c7d11b71c0366af4791af1e95f89b0211?hp=0ff89c31e4f8a0c3fc31772c4cf914c4fd7f5656

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