Merge branch 'tb/crlf-conv-flags'