Syncronised with Wesnoth 1.11 and Wesnoth 1.10