Merge branch 'master' into revise-map-geometry-generation
Conflicts:doomsday/client/src/world/map.cpp
Merge branch 'master' into revise-map-geometry-generation
Conflicts:
doomsday/client/src/world/map.cpp