From: Tom Hughes <tom@compton.nu>
Date: Wed, 2 Aug 2017 14:02:39 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/1603'
X-Git-Tag: live~3304
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/bc10bc87586f43e1ec9ca542524f7b8798b29029

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

bc10bc87586f43e1ec9ca542524f7b8798b29029