Merge remote-tracking branch 'origin/master' into next

readme.txt

src/command.c

src/d_clisrv.c

src/d_main.c

src/d_netcmd.c

src/doomdef.h

src/info.c

src/lua_baselib.c

src/lua_script.c

src/p_mobj.c

src/p_spec.c

src/p_user.c

src/sdl/macosx/Srb2mac.xcodeproj/project.pbxproj

src/sdl12/macosx/Srb2mac.xcodeproj/project.pbxproj

src/z_zone.c

src/z_zone.h

tools/wadzip/wadzip.c