Rebase to current master
authorhikemaniac <31667811+hikemaniac@users.noreply.github.com>
Fri, 18 May 2018 11:59:59 +0000 (13:59 +0200)
committerGitHub <noreply@github.com>
Fri, 18 May 2018 11:59:59 +0000 (13:59 +0200)
commit908f9b5276602f21f7d492c9949c934dfb1e9365
tree31741ddbb59e11ea73ff1804793bb18dc129b5e1
parentd799f4e75016325ad8e68a403b18bba54f149fba
parent1cea6b363aab3f67caa3cd5ef0b0eea9bcea5c2b
Rebase to current master

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