Merge universal newlines-related fixes (issue #13119)