merge to 3.3 - Fix closes Issue14281 - Test for cgi.escape by Brian Landers