Merge branch 'master' into next

SRB2_Debug.props

src/i_tcp.c

src/mserv.c

src/sdl/i_main.c

src/win32/Makefile.cfg

src/win32/win_main.c

src/win32/win_sys.c

src/win32/win_vid.c