Merge pull request #9341 from iNavFlight/mmosca-authors