From: Tom Hughes <tom@compton.nu>
Date: Wed, 18 Apr 2018 17:38:50 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/1826'
X-Git-Tag: live~3054
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/9d739b3d5b0450ea1a24dd86c5e15477866c0a41

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

9d739b3d5b0450ea1a24dd86c5e15477866c0a41