From: Tom Hughes <tom@compton.nu>
Date: Wed, 26 Oct 2016 14:48:56 +0000 (+0100)
Subject: Merge remote-tracking branch 'openstreetmap/pull/1338'
X-Git-Tag: live~3708
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/8920a56133d24d328b774ef166a07949746e008a

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

8920a56133d24d328b774ef166a07949746e008a