From: Tom Hughes <tom@compton.nu>
Date: Wed, 3 Oct 2018 21:39:17 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2010'
X-Git-Tag: live~2854
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/25f27a753f6a79bc1ae494e42cf03b9880d0bdcd?ds=sidebyside

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

25f27a753f6a79bc1ae494e42cf03b9880d0bdcd