Merge branch 'master' into revise-texture-animation
Conflicts:doomsday/client/src/render/rend_main.cpp
Merge branch 'master' into revise-texture-animation
Conflicts:
doomsday/client/src/render/rend_main.cpp