Merge branch 'master' into file-loading-cleanup

src/d_clisrv.c

src/d_netcmd.c

src/hardware/hw_main.c

src/lua_script.c

src/r_bsp.c

src/r_plane.c

src/r_segs.c