From: Tom Hughes <tom@compton.nu>
Date: Wed, 3 Oct 2018 17:54:19 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2012'
X-Git-Tag: live~2813
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/8877427ab9e49f509414c2fa4d71ccc3e2ac8796

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

8877427ab9e49f509414c2fa4d71ccc3e2ac8796