From: Tom Hughes <tom@compton.nu>
Date: Wed, 12 Oct 2016 18:07:55 +0000 (+0100)
Subject: Merge remote-tracking branch 'openstreetmap/pull/1322'
X-Git-Tag: live~3712
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/02eeefbe0ff7d5d60d6a7133942f5792d2aabb15

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

02eeefbe0ff7d5d60d6a7133942f5792d2aabb15