From: Tom Hughes <tom@compton.nu>
Date: Wed, 2 Sep 2020 06:11:47 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2804'
X-Git-Tag: live~2073
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/8ddde98b891fda115ed23b47f22c3e4a1b20eeff?hp=40291ec44cef10edb8f1ed1a8dca7ebd09a0c2d3

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