update for the latest copter modes
Merge branch 'master' into toakka