From: Tom Hughes <tom@compton.nu>
Date: Mon, 16 Oct 2017 18:08:32 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/1580'
X-Git-Tag: live~3266
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/87918595da1e1fad2ddd7aa62f9fc537dff657ff?ds=sidebyside

Merge remote-tracking branch 'upstream/pull/1580'
---

87918595da1e1fad2ddd7aa62f9fc537dff657ff