Merge branch 'master' into cutscene-cleanup

src/am_map.c

src/console.c

src/d_main.c

src/d_netcmd.c

src/hardware/hw_draw.c

src/hardware/hw_main.c

src/hardware/hw_main.h

src/p_local.h

src/p_setup.c

src/r_bsp.c

src/r_main.c

src/r_plane.c

src/r_plane.h

src/r_segs.c

src/r_splats.c

src/r_things.c

src/screen.c