Sync with upstream MonoGame