Merge "Standardize line endings"