Merge branch 'fg/autocrlf'