From: hikemaniac <31667811+hikemaniac@users.noreply.github.com>
Date: Fri, 18 May 2018 11:59:59 +0000 (+0200)
Subject: Rebase to current master
X-Git-Tag: live~2982^2
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/908f9b5276602f21f7d492c9949c934dfb1e9365?hp=-c

Rebase to current master

Merge openstreetmap/openstreetmap-website into hikemaniac/openstreetmap-website
---

908f9b5276602f21f7d492c9949c934dfb1e9365