From: Tom Hughes <tom@compton.nu>
Date: Wed, 14 Nov 2018 13:13:56 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2060'
X-Git-Tag: live~2795
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/75189bd17d42166871c7ffce07917fdd73dbcfa4

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

75189bd17d42166871c7ffce07917fdd73dbcfa4