Revert "Merge remote-tracking branch 'upstream/master' into ArduCopter-3.2"

This reverts commit 9fad36683c10f8e31e11a548e22d95749c90b161.