First pass at CPAN (with CPANPLUS) for 5.16.2