Merge branch 'current/for_cpan_index' into current/blead
Peter Rabbitson [Wed, 11 Mar 2015 04:54:34 +0000 (05:54 +0100)]

Trivial merge