Merge pull request #3828 from pprindeville/fix-perl-cgi2