Merge branch 'current/for_cpan_index' into current/blead
Peter Rabbitson [Sun, 15 Feb 2015 10:55:36 +0000 (11:55 +0100)]

Trivial merge