Merge branch 'master' into knuxstuff

extras/conf/SRB2-22.cfg

libs/libopenmpt/lib/x86/libopenmpt.lib

libs/libopenmpt/lib/x86_64/libopenmpt.lib

src/command.c

src/console.c

src/d_clisrv.c

src/d_clisrv.h

src/d_main.c

src/d_net.c

src/d_netcmd.c

src/d_netcmd.h

src/d_player.h

src/dehacked.c

src/doomdef.h

src/doomstat.h

src/f_finale.c

src/f_finale.h

src/g_game.c

src/g_game.h

src/hardware/hw_bsp.c