From: Tom Hughes <tom@compton.nu>
Date: Wed, 9 Mar 2016 22:27:40 +0000 (+0000)
Subject: Merge remote-tracking branch 'openstreetmap/pull/1120'
X-Git-Tag: live~3883
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/860887de5272c3e2a39cb7e0c9db6f0acba1b4c6?hp=--cc

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

860887de5272c3e2a39cb7e0c9db6f0acba1b4c6