Merge version from CPAN with version from github
Re-include RT#30032 into merged files
Clean up pre-reqs
Re-create distmeta
Re-create distmeta
Resolve merge conflict