Merge branch 'next' into udmf-next

extras/conf/SRB2-22.cfg

src/dehacked.c

src/doomdef.h

src/doomstat.h

src/hardware/hw_bsp.c

src/hardware/hw_main.c

src/lua_blockmaplib.c

src/lua_maplib.c

src/p_map.c

src/p_maputl.c

src/p_mobj.c

src/p_polyobj.c

src/p_polyobj.h

src/p_saveg.c

src/p_setup.c

src/p_sight.c

src/p_spec.c

src/p_user.c

src/r_bsp.c

src/r_bsp.h