Tim.
It doesn't look like jonz has taken my cgi.in updates (whereby the .cgi
scripts are preprocessed slightly). So when updating to future upstream
changes, make sure that any upstream changes to the .cgi files are
manually applied to the .cgi.in files.