Merge branch 'master' into beta_mavlink2
Merge remote-tracking branch 'upstream/beta_mavlink2' into test_20140315