From: Tom Hughes <tom@compton.nu>
Date: Mon, 7 Dec 2015 14:11:35 +0000 (+0000)
Subject: Merge remote-tracking branch 'openstreetmap/pull/1085'
X-Git-Tag: live~3960
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/ec9d2fde783796829a84655387e1810ea4b5e642

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

ec9d2fde783796829a84655387e1810ea4b5e642