Add sdl2-image dependency to travis config
Merge branch 'master' into msvc-compat