Merge branch 'master' into ringzero+master
Conflicts:doomsday/engine/portable/src/p_data.cdoomsday/engine/portable/src/sys_opengl.c
Merge branch 'master' into ringzero+master
Conflicts:
doomsday/engine/portable/src/p_data.c
doomsday/engine/portable/src/sys_opengl.c