Merge branch 'tb/t0027-eol-conversion'