From: Tom Hughes <tom@compton.nu>
Date: Tue, 15 May 2018 17:36:55 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/1863'
X-Git-Tag: live~3035
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/9e50c3851ce56514004fc12bcf2c71817fc44b0b?ds=sidebyside

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

9e50c3851ce56514004fc12bcf2c71817fc44b0b