Merge branch 'master' of github.com:mavlink/qgroundcontrol into config
Merge branch 'config' of github.com:mavlink/qgroundcontrol into config