Merge branch 'master' into audio-cleanup
Conflicts:doomsday/apps/client/src/clientapp.cppdoomsday/apps/client/src/dd_main.cpp
Merge branch 'master' into audio-cleanup
Conflicts:
doomsday/apps/client/src/clientapp.cpp
doomsday/apps/client/src/dd_main.cpp