Fixed hopefully travis.
Merge branch 'master' into sdl2_support