update from mavlink branch