Merge remote-tracking branch 'remotes/origin/master' into revise-map-geometry-generation
Conflicts:doomsday/client/src/world/sectorcluster.cpp
Merge remote-tracking branch 'remotes/origin/master' into revise-map-geometry-generation
Conflicts:
doomsday/client/src/world/sectorcluster.cpp