From: Tom Hughes <tom@compton.nu>
Date: Thu, 2 Feb 2017 17:21:41 +0000 (+0000)
Subject: Merge remote-tracking branch 'openstreetmap/pull/1423'
X-Git-Tag: live~3639
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/7793cd27abcc26af103c77d5947c368b54295a79

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

7793cd27abcc26af103c77d5947c368b54295a79