Merge commits: [cgi-ok-error] and 'Extended the index file lookup list'.

WTF for these dumb stupid branch merges after `git push` commands that used to JUST WORK previously (in most cases, not always, though)?