fix line endings
fix line endings
Merge branch 'master' into debug_tools