Merge remote-tracking branch 'px4/beta' into beta_mavlink
Merge branch 'beta_mavlink' into beta_mavlink2