Merge branch 'patch-sdl'