Paper over bug #18921 with an assert
Merge branch 'master' of github.com:wesnoth/wesnoth-old