From: Tom Hughes <tom@compton.nu>
Date: Mon, 14 Mar 2016 22:11:23 +0000 (+0000)
Subject: Merge remote-tracking branch 'openstreetmap/pull/954'
X-Git-Tag: live~3906
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/16f5a5ac0c674b258996fcbde1c3fda2e651906a

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

16f5a5ac0c674b258996fcbde1c3fda2e651906a