Merge in modified version of mavlink
Merge branch 'master' into 30-mavlink