From: Tom Hughes <tom@compton.nu>
Date: Mon, 2 Apr 2018 14:41:35 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/1804'
X-Git-Tag: live~3114
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/be35dda9c36904779a1f34d417e4d7357b1e4415

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

be35dda9c36904779a1f34d417e4d7357b1e4415