From: Tom Hughes <tom@compton.nu>
Date: Wed, 19 Oct 2016 11:22:42 +0000 (+0100)
Subject: Merge remote-tracking branch 'openstreetmap/pull/1332'
X-Git-Tag: live~3752
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/99ccffe4a9c0521d1202c4f0f1a37f8ef2dc0634?hp=-c

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

99ccffe4a9c0521d1202c4f0f1a37f8ef2dc0634