update sdl2
Merge branch 'master' into tobias-test3
...