Merge pull request #1748 from iNavFlight/development