From: Tom Hughes <tom@compton.nu>
Date: Wed, 6 Jun 2018 13:33:36 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/1893'
X-Git-Tag: live~3013
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/4df0fe72e28246f81573b98fbf30f13fee16a6b6

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

4df0fe72e28246f81573b98fbf30f13fee16a6b6