linux fixes
Merge branch 'master' into linux
removed debug code