synced to svn r1647

Synced to original multiwii 1647