From: Tom Hughes <tom@compton.nu>
Date: Thu, 9 Jan 2020 11:03:34 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2500'
X-Git-Tag: live~2412
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/bd7c279604469e0ef22ed8148603befa469d9c2b

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

bd7c279604469e0ef22ed8148603befa469d9c2b