Merge branch 'upgrade-upstream'

Conflicts:
	frontend/vc.c
vc: include errno.h

Otherwise we can't reliably use errno.
vc: include unistd.h on non-Windows

Otherwise we can't reliably use unlink.