Merge branch 'master' into next

src/d_netfil.c

src/m_argv.c

src/m_misc.c

src/m_misc.h

src/sdl12/sdl_sound.c

src/w_wad.c