Merge remote-tracking branch 'upstream/ArduCopter-3.2' into ArduCopter-3.2