try to fix travis build
Merge branch 'master' of git://github.com/wesnoth/wesnoth