From: Tom Hughes <tom@compton.nu>
Date: Wed, 8 Jul 2020 17:33:21 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2699'
X-Git-Tag: live~3120
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/c74ec0aa49f54e7068d8dfa8d2a61f9a3f28d10e?hp=41d6f19a6bed3b1a53f2fba12ca86ffbac1f8f5a

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