From: Tom Hughes <tom@compton.nu>
Date: Wed, 25 Apr 2018 16:44:53 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/1833'
X-Git-Tag: live~3091
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/827024f7e6c48a11dbe08e569e2cbd852701bd31

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

827024f7e6c48a11dbe08e569e2cbd852701bd31