Merge branch 'jk/prune-mtime' into maint