From: Tom Hughes <tom@compton.nu>
Date: Thu, 14 Jan 2021 10:52:10 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/3048'
X-Git-Tag: live~1873
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/f61455b8e73d030b7ee87f8ad658c1400e6fab63?hp=-c

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

f61455b8e73d030b7ee87f8ad658c1400e6fab63