Merge branch 'beta' into beta_mavlink
Merge branch 'master' of github.com:PX4/Firmware into beta_mavlink
Merged master into beta_mavlink
Merge branch 'beta_mavlink' of github.com:PX4/Firmware into beta_mavlink2