Merge branch 'master' into next

src/android/i_sound.c

src/d_main.c

src/d_netcmd.c

src/djgppdos/i_sound.c

src/doomstat.h

src/dummy/i_sound.c

src/hardware/hw3sound.c

src/i_sound.h

src/m_menu.c

src/p_mobj.c

src/s_sound.c

src/s_sound.h

src/sdl/i_video.c

src/sdl/mixer_sound.c

src/sdl/sdl_sound.c

src/win32/win_cd.c

src/win32/win_main.c

src/win32/win_snd.c