Revert "Revert "Merge branch 'master' of github.com:wesnoth/wesnoth-old""

This reverts commit 23b72d6956e6316f8b50a6accba607f66cf197a7.
Merge branch 'master' of github.com:wesnoth/wesnoth-old