Merge branch 'master' into musicplus-sdlmixerx

src/d_clisrv.c

src/d_netcmd.c

src/d_player.h

src/dehacked.c

src/doomdata.h

src/doomdef.h

src/f_finale.c

src/g_game.c

src/hardware/hw_light.c

src/hardware/hw_main.c

src/hardware/hw_md2.c

src/info.c

src/info.h

src/lua_baselib.c

src/lua_blockmaplib.c

src/lua_hook.h

src/lua_hooklib.c

src/lua_hudlib.c

src/lua_maplib.c

src/lua_mobjlib.c