From: Tom Hughes <tom@compton.nu>
Date: Thu, 11 Jul 2019 19:23:31 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2305'
X-Git-Tag: live~2491
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/64f70a7cb0f13cf9adf552051dc2dd9db111fd46

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

64f70a7cb0f13cf9adf552051dc2dd9db111fd46