From: Tom Hughes <tom@compton.nu>
Date: Wed, 8 Jul 2020 17:57:32 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2697'
X-Git-Tag: live~2068
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/3a43f9fe0421afdf74d2f570ee8987a4022519cf

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

3a43f9fe0421afdf74d2f570ee8987a4022519cf