Implement flight mode (applying patches from Tony Espy)
Merge branch 'master-switch'