Merge remote-tracking branch 'Zygo/master'

Conflicts:
	utils/colors.c
	utils/minixpm.c
	xscreensaver.xcodeproj/project.pbxproj