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