Merge branch 'feature/sdl2'