Merge branch 'tb/t0027-raciness-fix' into jc/renormalize-merge-kill-safer-crlf