Merge branch 'master' into software-fixes

.travis.yml

src/blua/lcode.c

src/blua/ltablib.c

src/d_netcmd.c

src/i_tcp.c

src/m_menu.c

src/sdl/i_main.c