- merged upstream mavlink: some ensuing changes