From: Tom Hughes <tom@compton.nu>
Date: Sun, 30 Oct 2016 16:57:35 +0000 (+0000)
Subject: Merge remote-tracking branch 'openstreetmap/pull/1351'
X-Git-Tag: live~4764
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/ce6368119f7e51c60a4fd30fcf00e1217689eb83?ds=inline;hp=--cc

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

ce6368119f7e51c60a4fd30fcf00e1217689eb83