From: Tom Hughes <tom@compton.nu>
Date: Mon, 12 Oct 2015 20:15:47 +0000 (+0100)
Subject: Merge remote-tracking branch 'openstreetmap/pull/1068'
X-Git-Tag: live~4010
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/d2765cb23d5501b6f10c82afdd90a760674f542f?hp=-c

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

d2765cb23d5501b6f10c82afdd90a760674f542f