Merge "Remove Windows-style newlines using dos2unix"