From: Tom Hughes <tom@compton.nu>
Date: Wed, 9 Mar 2016 18:40:41 +0000 (+0000)
Subject: Merge remote-tracking branch 'openstreetmap/pull/1174'
X-Git-Tag: live~3889
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/bb489ed5a3c5f2bc0de73b36f516d417095bfed5

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

bb489ed5a3c5f2bc0de73b36f516d417095bfed5