From: Tom Hughes <tom@compton.nu>
Date: Mon, 27 Jul 2020 14:20:39 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2734'
X-Git-Tag: live~2680
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/77e91beba1b03da718e32b771eb4f23d30d83483?hp=544450697654797e7c69710a2567d52819d210d1

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