Merge branch 'next' into oglshaderport

extras/conf/SRB2-22.cfg

src/d_main.c

src/g_game.c

src/info.c

src/m_misc.c

src/p_enemy.c

src/p_mobj.c

src/p_saveg.c

src/p_setup.c

src/p_setup.h

src/p_slopes.c

src/p_slopes.h

src/p_spec.c

src/p_spec.h