Merge branch 'sp/safecrlf'