Merge latest from mainstream.

Conflicts:
	game.cpp
	iuse.cpp
	iuse.h