Merge branch 'next' into patch-stuff-again-2

src/dummy/i_video.c

src/f_finale.c

src/f_wipe.c

src/filesrch.c

src/g_demo.c

src/g_game.c

src/g_game.h

src/g_input.c

src/g_input.h

src/hardware/hw_cache.c

src/hardware/hw_defs.h

src/hardware/hw_drv.h

src/hardware/hw_main.c

src/hardware/hw_main.h

src/hardware/hw_md2.c

src/hardware/hw_model.c

src/hardware/hw_model.h

src/hardware/r_opengl/r_opengl.c

src/http-mserv.c

src/hu_stuff.c