From: Tom Hughes <tom@compton.nu>
Date: Mon, 30 Apr 2018 17:56:09 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/1802'
X-Git-Tag: live~3033
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/69ff048ae11315e2afc0433b938b76acec67b204

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

69ff048ae11315e2afc0433b938b76acec67b204