From: Tom Hughes <tom@compton.nu>
Date: Wed, 26 Oct 2016 14:35:18 +0000 (+0100)
Subject: Merge remote-tracking branch 'openstreetmap/pull/1336'
X-Git-Tag: live~3805
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/20aa4ba31b61a926c8fcb98f88c02f7d1cbeb655?hp=-c

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

20aa4ba31b61a926c8fcb98f88c02f7d1cbeb655