From: Andy Allan <git@gravitystorm.co.uk>
Date: Wed, 31 Oct 2018 10:16:47 +0000 (+0100)
Subject: Merge branch 'master' into cancancan
X-Git-Tag: live~2772^2~4
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/f11221f05bcdd05edd7a9f97d6d57e7baaeb4921

Merge branch 'master' into cancancan
---

f11221f05bcdd05edd7a9f97d6d57e7baaeb4921