Merge branch 'jk/filter-branch-use-of-sed-on-incomplete-line' into maint