Merge updates from wesnoth:master