Merge code from the version 2.07 CPAN package.

We preserve the commit that added the CPAN repository metadata.