update cgi
Merge remote-tracking branch 'origin/master'

Conflicts:
	cgi-bin/compile.cgi