From: Tom Hughes <tom@compton.nu>
Date: Thu, 4 Jun 2020 16:40:13 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2642'
X-Git-Tag: live~2145
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/293fe68eff1923a00992e0a195ba025ab7bd9efa

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

293fe68eff1923a00992e0a195ba025ab7bd9efa