Merge pull request #3540 from Memphiz/libsdl