Woops, merged in irrelevant changes from MG-SDL2