From: Tom Hughes <tom@compton.nu>
Date: Wed, 26 Oct 2016 14:54:42 +0000 (+0100)
Subject: Merge remote-tracking branch 'openstreetmap/pull/1339'
X-Git-Tag: live~3707
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/2df3605142e73ef38c1ad307cbbd5437770b8d96

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

2df3605142e73ef38c1ad307cbbd5437770b8d96