From: Tom Hughes <tom@compton.nu>
Date: Fri, 19 Aug 2016 11:26:51 +0000 (+0100)
Subject: Merge remote-tracking branch 'openstreetmap/pull/1036'
X-Git-Tag: live~3808
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/d48b25124eaf561428176c60b79cc90e0a8e8125

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

d48b25124eaf561428176c60b79cc90e0a8e8125