well that was stupid
Merge branch 'master' into sdl2