Merge "Unix style line ending"