From: Tom Hughes <tom@compton.nu>
Date: Wed, 8 Jul 2020 18:04:04 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2670'
X-Git-Tag: live~2640
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/4cf3c3b6ed7cc6ab0728b320afde5854489629fb

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

4cf3c3b6ed7cc6ab0728b320afde5854489629fb