Merge branch 'ek/maint-1.6.1-filter-branch-bare' into maint-1.6.1