From: Tom Hughes <tom@compton.nu>
Date: Wed, 13 Jan 2021 20:40:48 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2994'
X-Git-Tag: live~1743
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/4abd9cfcf19701bf43322374c5df6dd586449e54

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

4abd9cfcf19701bf43322374c5df6dd586449e54