From: Tom Hughes <tom@compton.nu>
Date: Tue, 28 Aug 2018 17:53:45 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/1948'
X-Git-Tag: live~2918
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/e0abb299d01097a5469a7e72b2e63194e0cc6003

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

e0abb299d01097a5469a7e72b2e63194e0cc6003