From: Tom Hughes <tom@compton.nu>
Date: Tue, 28 Feb 2017 00:21:23 +0000 (+0000)
Subject: Merge remote-tracking branch 'openstreetmap/pull/1469'
X-Git-Tag: live~3559
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/56e96d856c7fc168b37cf9d26a58a6da8094cedb?hp=--cc

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

56e96d856c7fc168b37cf9d26a58a6da8094cedb