Line endings and other changes to make the diffs more logical PART 2