Dum dum
sdl2: updates and osx build fixes
Merge branch 'master' into sdl2
woops and updated submodules
Merge branch 'master' into sdl2