From: Tom Hughes <tom@compton.nu>
Date: Wed, 13 Jan 2021 20:31:21 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/3045'
X-Git-Tag: live~2822
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/7f3b86e30b09dc9d21cabf97248edbde08b12d4d?hp=78bf2993e4c2f895b5debcdd6101a1febbcb69ca

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