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