From: Tom Hughes <tom@compton.nu>
Date: Fri, 10 Mar 2017 15:58:57 +0000 (+0000)
Subject: Merge remote-tracking branch 'openstreetmap/pull/1484'
X-Git-Tag: live~3525
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/ae4c00da8cd87b77f08ff011b0d61ea6851c9f13?hp=-c

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

ae4c00da8cd87b77f08ff011b0d61ea6851c9f13