Merge branch 'master' into common-episode-definition
Conflicts:doomsday/plugins/common/src/g_game.cpp
Merge branch 'master' into common-episode-definition
Conflicts:
doomsday/plugins/common/src/g_game.cpp