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

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

69fa4e9940fe2858c90ea39277ef6ffcd84a3ca6