Merge branch 'master' into next

src/d_main.c

src/lua_hooklib.c

src/p_setup.c

src/r_patch.c

src/sdl/i_video.c

src/w_wad.c

src/w_wad.h