Merge remote-tracking branch 'upstream/master'
test commit

test commit
Merge branch 'master' of https://github.com/mattmccrink/qgroundcontrol