Merge branch 'fg/autocrlf' into next