Merge branch 'master' into next

src/d_clisrv.c

src/d_main.c

src/d_netfil.c

src/g_game.c

src/m_menu.c

src/p_setup.c

src/sdl/sdl_sound.c