Update to upstream SDL2#