Updated for version 3.985
Merge remote-tracking branch 'upstream/master'

Conflicts:
	minmode/resource/GameMenu.res
	resource/GameMenu.res