Changes anticipating new Argus release for ARDrone
Merge remote-tracking branch 'upstream/master'