Merge pull request #6233 from leocb/add-gforce-osd