From: Tom Hughes <tom@compton.nu>
Date: Wed, 18 Mar 2020 11:02:07 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2560'
X-Git-Tag: live~3573
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/33d70b3c2d7b90234aba8b29bee341d2a80f4d1e?hp=b0c50ab344f924e855d9a9003c1b913685d1bb62

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