Rebase from 'upstream'
Trimmed the branch to only the mavros sub directory