Merge branch 'master' into ports-chopping-block

.travis.yml

src/Makefile.cfg

src/d_clisrv.c

src/d_clisrv.h

src/d_player.h

src/dehacked.c

src/g_game.c

src/hardware/hw_clip.c

src/hardware/hw_data.h

src/hu_stuff.c

src/info.c

src/info.h

src/lua_hook.h

src/lua_hooklib.c

src/lua_playerlib.c

src/lua_skinlib.c

src/m_cheat.c

src/m_menu.c

src/m_menu.h

src/p_enemy.c