Merge pull request #606 from PX4/sbus2

Sbus2
Merge branch 'cleanup'
Merge branch 'master' into beta