Merge "Convert line breaks to Unix style"