Merge back from MG-SDL2