Merge branch 'master' into next

.travis.yml

CMakeLists.txt

src/CMakeLists.txt

src/b_bot.c

src/f_finale.c

src/hardware/hw_md2.c

src/info.c

src/m_menu.c

src/m_misc.c

src/p_enemy.c

src/p_map.c

src/p_user.c

src/sdl/CMakeLists.txt