From: Tom Hughes <tom@compton.nu>
Date: Thu, 8 Nov 2018 17:31:30 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2050'
X-Git-Tag: live~2829
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/10294f4849b5d97185c618687a710a2dfc19f148

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

10294f4849b5d97185c618687a710a2dfc19f148