Merge branch 'ew/svn-crlf'