Merge branch 'perl-sub-protos' into maint