Merge branch 'gambit' into nfg

Conflicts:
	build/pkgs/gambit/spkg-install
completes merge