Merge pull request #9067 from garbear/fix-xbox