Merge branch 'current/for_cpan_index' into current/dq