Backport legacy-cgi to 1.8 branch
#469
+3
−0
Merged