Merge branch 'master' into next

src/android/i_sound.c

src/d_clisrv.c

src/d_main.c

src/d_main.h

src/d_net.c

src/d_netcmd.h

src/djgppdos/i_sound.c

src/doomstat.h

src/dummy/i_sound.c

src/f_finale.c

src/g_game.c

src/hardware/hw_bsp.c

src/hardware/hw_main.c

src/hu_stuff.h

src/i_sound.h

src/m_anigif.c

src/nds/i_sound.c

src/p_local.h

src/p_user.c

src/r_main.c