Merge branch 'jc/maint-diff-core-safecrlf' into maint