Comment fix
Merge branch 'beta'
Merge branch 'master' into px4io_fix