Merge commit '74bae62cc911c90dd17a11ca9b18f1cd9383f8fc' into HEAD

Conflicts:
	Game/Help/Blacksmith.rsc