From: Tom Hughes <tom@compton.nu>
Date: Fri, 18 Sep 2020 07:31:31 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2842'
X-Git-Tag: live~2723
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/e6540a4dba6a82179bf07affca1d7e10215d9da9?hp=bcf08e54b4e1e17e108ad7f3d024524b4877783c

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