From: Tom Hughes <tom@compton.nu>
Date: Thu, 23 Feb 2017 10:06:42 +0000 (+0000)
Subject: Merge remote-tracking branch 'openstreetmap/pull/1436'
X-Git-Tag: live~3582
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/392b68a65fd6ffa521b89e079b234bb0241380d3

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

392b68a65fd6ffa521b89e079b234bb0241380d3