Merge branch 'jc/peace-with-crlf'