From: Tom Hughes <tom@compton.nu>
Date: Mon, 14 May 2018 19:14:56 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/1858'
X-Git-Tag: live~3065
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/d14cf519fd876274900758a903e7e390d38922d5

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

d14cf519fd876274900758a903e7e390d38922d5