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