Merge branch 'master' of https://github.com/wesnoth/wesnoth-old into sync_2

Conflicts:
	src/race.cpp