Merge branch 'tb/crlf-tests'