synchronized with the CPAN release 0.18.