Merge pull request #10191 from Ansuel/cgi-io-fix