merge upstream monogame-sdl2 changes