Merge branch 'jc/index-pack-reject-dups' into maint