Merge pull request #6422 from mikeller/add_antigravity_mode_to_msp