Merge branch 'master' into Mario/wrath-darkplaces

diff --cc cl_main.c
Simple merge

diff --cc cl_parse.c
Simple merge

diff --cc cl_screen.c
Simple merge

diff --cc fs.c
Simple merge

diff --cc gl_draw.c
Simple merge

diff --cc gl_rmain.c
Simple merge

diff --cc host.c
Simple merge

diff --cc quakedef.h
Simple merge