Fix more of #2133 \r\r\n line endings.
Merge pull request #2604 from juj/fix_more_line_endings

Fix more of #2133 \r\r\n line endings.