Merge branch 'jk/filter-branch-require-clean-work-tree' into maint