From: Tom Hughes <tom@compton.nu>
Date: Sun, 10 Jun 2018 16:02:12 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: live~4045^2~6
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/d3700e6201b4b78a70bbb2941572edc985b63c2c?hp=d3700e6201b4b78a70bbb2941572edc985b63c2c

Merge branch 'master' into next
---