From: Tom Hughes <tom@compton.nu>
Date: Thu, 23 Jun 2016 07:59:58 +0000 (+0100)
Subject: Merge remote-tracking branch 'openstreetmap/pull/1240'
X-Git-Tag: live~3860
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/e15c00dc2cfdc220be15ce1392d29b238b3d6991?hp=-c

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

e15c00dc2cfdc220be15ce1392d29b238b3d6991