From: Tom Hughes <tom@compton.nu>
Date: Sun, 20 Mar 2016 18:47:35 +0000 (+0000)
Subject: Merge remote-tracking branch 'openstreetmap/pull/954'
X-Git-Tag: live~3897
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/945ff7911ca51dc250ffaba71f62821b5c0c0a95?hp=--cc

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

945ff7911ca51dc250ffaba71f62821b5c0c0a95