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

.travis.yml

appveyor.yml

assets/CMakeLists.txt

debian-template/control

deployer/travis/deployer_defaults.sh

src/d_clisrv.c

src/d_net.h

src/d_netcmd.c

src/g_game.c

src/g_game.h

src/i_tcp.c

src/m_menu.c

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