Sync'ing adam@'s changes in devel/SDL2 here. Updated to latest revision.