Merge pull request #1374 from iNavFlight/development