Merge branch 'master' into texture-fixes

src/Makefile

src/config.h.in

src/console.c

src/d_clisrv.c

src/d_main.c

src/d_netcmd.c

src/d_netfil.c

src/dehacked.c

src/hardware/hw_cache.c

src/lua_script.c

src/m_misc.c

src/p_saveg.c

src/p_setup.c

src/p_setup.h

src/p_spec.c

src/sdl/i_system.c

src/st_stuff.c

src/w_wad.c

src/w_wad.h

src/z_zone.c