From: Tom Hughes <tom@compton.nu>
Date: Wed, 9 Mar 2016 19:05:16 +0000 (+0000)
Subject: Merge remote-tracking branch 'openstreetmap/pull/1122'
X-Git-Tag: live~4435
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/ca5de5b4e01297b07ce3a9db45e908f15f7cda11?hp=--cc

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

ca5de5b4e01297b07ce3a9db45e908f15f7cda11