Merge "Change to unix eol style"