Strip some debugging
Fix a leftover from the earlier merges; building should work now.
Merge branch 'master' of github.com:PX4/Firmware into sunday