Merge branch 'master' into flicky-things

.travis.yml

src/android/i_cdmus.c

src/d_netcmd.c

src/d_player.h

src/dehacked.c

src/djgppdos/i_cdmus.c

src/doomstat.h

src/g_game.c

src/hu_stuff.c

src/hu_stuff.h

src/info.c

src/info.h

src/lua_maplib.c

src/lua_playerlib.c

src/m_cheat.c

src/m_cheat.h

src/m_menu.c

src/p_enemy.c

src/p_inter.c

src/p_map.c