From: Tom Hughes <tom@compton.nu>
Date: Tue, 16 Aug 2016 18:11:35 +0000 (+0100)
Subject: Merge remote-tracking branch 'openstreetmap/pull/788'
X-Git-Tag: live~3816
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/778659a78cdbdbf03014943b9ce85b990daa8cb1?hp=--cc

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

778659a78cdbdbf03014943b9ce85b990daa8cb1