Merge branch 'jc/docmake-perl'