From: Tom Hughes <tom@compton.nu>
Date: Mon, 17 Jul 2017 13:27:58 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/1587'
X-Git-Tag: live~3350
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/d14b251767452a514a9889771cf682e20be36946

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

d14b251767452a514a9889771cf682e20be36946