Merge from upstream MG-SDL2