Merge branch 'master' into next

src/Makefile

src/hardware/hw_main.c

src/lua_script.c

src/p_mobj.c

src/p_mobj.h

src/p_saveg.c

src/p_spec.c

src/p_tick.c

src/r_things.c

src/sdl/i_system.c

src/sdl/mixer_sound.c

src/v_video.c

src/w_wad.c

src/win32/win_snd.c