Merge branch 'tb/t0027-crlf'