Merge branch 'jc/maint-filter-branch-epoch-date' into maint