From: Tom Hughes <tom@compton.nu>
Date: Wed, 26 Oct 2016 14:41:30 +0000 (+0100)
Subject: Merge remote-tracking branch 'openstreetmap/pull/1337'
X-Git-Tag: live~3848
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/3371ca37f1728d6e37202ceff9bd968688f59a8a?hp=3371ca37f1728d6e37202ceff9bd968688f59a8a

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