From: Tom Hughes <tom@compton.nu>
Date: Sun, 4 Feb 2018 15:09:40 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/1704'
X-Git-Tag: live~3691
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/673b58f96f3acfd0281c62a2a7f080825b6fb28b?hp=--cc

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

673b58f96f3acfd0281c62a2a7f080825b6fb28b