Merge branch 'jc/renormalize-merge-kill-safer-crlf'