Merge pull request #7565 from mikeller/rename_alienflightf4