Merge from ardupilot master