From: Andy Allan <git@gravitystorm.co.uk>
Date: Fri, 9 Mar 2018 07:57:24 +0000 (+0800)
Subject: Merge branch 'pull/1765'
X-Git-Tag: live~3139
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/0f5ad1f3cc5d82efef93d2d17809145c5f68f233?hp=0f5ad1f3cc5d82efef93d2d17809145c5f68f233

Merge branch 'pull/1765'
---