The Great Untangling.
Merge branch 'master' of https://github.com/monkeypants/MAVProxy