From: Tom Hughes <tom@compton.nu>
Date: Thu, 30 Jan 2020 10:07:59 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2525'
X-Git-Tag: live~2407
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/8bf704ba84e6b0ec85023cfc8f6ae3571d5b7a38?hp=-c

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

8bf704ba84e6b0ec85023cfc8f6ae3571d5b7a38