From: Tom Hughes <tom@compton.nu>
Date: Wed, 28 Oct 2020 15:56:59 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2920' into master
X-Git-Tag: live~1847
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/2479319b7859d9b271dc8900e5d530c77976025a

Merge remote-tracking branch 'upstream/pull/2920' into master
---

2479319b7859d9b271dc8900e5d530c77976025a