From: Tom Hughes <tom@compton.nu>
Date: Mon, 30 Dec 2019 21:37:32 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2470'
X-Git-Tag: live~2320
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/1597a2f8798861ffc2f47fe2d3f3958a532bd127

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

1597a2f8798861ffc2f47fe2d3f3958a532bd127