Merge branch 'master' into overhaul-resources
Conflicts:doomsday/engine/include/render/r_lumobjs.hdoomsday/engine/src/render/r_sky.c
Merge branch 'master' into overhaul-resources
Conflicts:
doomsday/engine/include/render/r_lumobjs.h
doomsday/engine/src/render/r_sky.c