From: Tom Hughes <tom@compton.nu>
Date: Mon, 15 Feb 2016 21:09:59 +0000 (+0000)
Subject: Merge remote-tracking branch 'openstreetmap/pull/1154'
X-Git-Tag: live~3949
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/3238bf567c5c8a0e807343588b8f38f86d65c1cd?hp=-c

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

3238bf567c5c8a0e807343588b8f38f86d65c1cd