Merge pull request #3739 from pprindeville/fix-perl-cgi