From: Tom Hughes <tom@compton.nu>
Date: Wed, 14 Nov 2018 12:43:35 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2061'
X-Git-Tag: live~2814
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/dd302f4f2c56d1e9f1a2e39a54670f6f5a9bbd34

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

dd302f4f2c56d1e9f1a2e39a54670f6f5a9bbd34