From: Tom Hughes <tom@compton.nu>
Date: Sat, 29 Oct 2016 17:08:31 +0000 (+0100)
Subject: Merge remote-tracking branch 'openstreetmap/pull/1349'
X-Git-Tag: live~3732
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/48eb8eb3690851f7f26afc68e1524341fcb6c187

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

48eb8eb3690851f7f26afc68e1524341fcb6c187