Merge branch 'master' into mapdata-c++
Conflicts:doomsday/client/src/map/dam_file.cppdoomsday/client/src/map/polyobj.cpp
Merge branch 'master' into mapdata-c++
Conflicts:
doomsday/client/src/map/dam_file.cpp
doomsday/client/src/map/polyobj.cpp