From: Andy Allan <git@gravitystorm.co.uk>
Date: Wed, 2 Aug 2017 11:12:57 +0000 (+0100)
Subject: Merge branch 'master' into moderation
X-Git-Tag: live~3038^2~109
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/e31376e28da8f656e33508cc899da465b63673c5?hp=e31376e28da8f656e33508cc899da465b63673c5

Merge branch 'master' into moderation
---