From: Tom Hughes <tom@compton.nu>
Date: Thu, 30 Aug 2018 17:26:05 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/1964'
X-Git-Tag: live~2880
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/a1b179fa384d689e6cb78c2b8d863621e7bff152

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

a1b179fa384d689e6cb78c2b8d863621e7bff152