Merge branch 'master' into resourcesystem
Conflicts:doomsday/client/src/gl/gl_draw.cppdoomsday/client/src/render/rend_main.cpp
Merge branch 'master' into resourcesystem
Conflicts:
doomsday/client/src/gl/gl_draw.cpp
doomsday/client/src/render/rend_main.cpp