Merge branch 'master' into scriptsys
Conflicts: doomsday/engine/engine.pro doomsday/libdeng2/include/de/libdeng2.h
Merge branch 'master' into scriptsys
Conflicts:
doomsday/engine/engine.pro
doomsday/libdeng2/include/de/libdeng2.h