Merge branch 'bc/blame-crlf-test' into maint