Merge branch 'master' into low-latency-input
Conflicts: doomsday/client/include/render/r_main.h doomsday/client/src/render/r_main.cpp
Merge branch 'master' into low-latency-input
Conflicts:
doomsday/client/include/render/r_main.h
doomsday/client/src/render/r_main.cpp