Merge in modified version of mavlink