Merge remote-tracking branch 'stjr/next' into dusty

src/Makefile

src/Makefile.cfg

src/blua/lcode.c

src/d_clisrv.c

src/d_main.c

src/d_netcmd.c

src/d_netcmd.h

src/d_player.h

src/deh_tables.c

src/dehacked.c

src/doomdef.h

src/doomtype.h

src/f_finale.c

src/g_demo.c

src/g_game.c

src/g_game.h

src/hardware/hw_batching.c

src/hardware/hw_batching.h

src/hardware/hw_draw.c

src/hardware/hw_main.c