From: Tom Hughes <tom@compton.nu>
Date: Tue, 24 Oct 2017 19:19:46 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/1659'
X-Git-Tag: live~3259
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/f0b2ed9bb6c1e153231b8088eabe6e3edcee9420

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

f0b2ed9bb6c1e153231b8088eabe6e3edcee9420