Merge branch 'next' into 2214

src/hardware/hw_main.c

src/hu_stuff.c

src/p_saveg.c

src/r_bsp.c

src/r_plane.c