From: Tom Hughes <tom@compton.nu>
Date: Wed, 5 Sep 2018 18:06:16 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/1974'
X-Git-Tag: live~3035
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/983e21db2e3ccc5f645f40a5f076d35e2b7897c2?ds=sidebyside;hp=983e21db2e3ccc5f645f40a5f076d35e2b7897c2

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