Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fix