From: Tom Hughes <tom@compton.nu>
Date: Wed, 3 Jun 2020 16:07:31 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2640'
X-Git-Tag: live~3399
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/49a576a390c60abf24f8a98889eef1590e981f0a

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

49a576a390c60abf24f8a98889eef1590e981f0a