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