Merge branch 'next' into public_next

SRB2.cbp

src/d_clisrv.c

src/d_clisrv.h

src/hardware/hw_main.c

src/m_aatree.h

src/p_enemy.c

src/p_mobj.c

src/p_saveg.c

src/p_setup.c

src/p_spec.c

src/r_defs.h

src/win32/win_dbg.c