Merge branch 'f-bundled-perl-modules'