From: Tom Hughes <tom@compton.nu>
Date: Wed, 30 Aug 2017 20:09:32 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/1614'
X-Git-Tag: live~3291
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/f1faffd4d1954f855f6450fc8e5c62ea5f457113

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

f1faffd4d1954f855f6450fc8e5c62ea5f457113