From: Tom Hughes <tom@compton.nu>
Date: Wed, 19 Oct 2016 10:52:17 +0000 (+0100)
Subject: Merge remote-tracking branch 'openstreetmap/pull/1331'
X-Git-Tag: live~3747
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/4627b79885a53043001383679e83fafacf5c6193

Merge remote-tracking branch 'openstreetmap/pull/1331'
---

4627b79885a53043001383679e83fafacf5c6193