From: Tom Hughes <tom@compton.nu>
Date: Mon, 26 Sep 2016 11:40:01 +0000 (+0100)
Subject: Merge remote-tracking branch 'openstreetmap/pull/1298'
X-Git-Tag: live~4302
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/4b5cb04d41e79db06707797c5a4b60e6aba27702?ds=sidebyside

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

4b5cb04d41e79db06707797c5a4b60e6aba27702