Merge branch 'next' into slope-fixes

.travis.yml

src/doomtype.h

src/md5.c

src/sdl/CMakeLists.txt

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

src/string.c