Merge proposals dependent on lp:~widelands-dev/widelands/fix_encyclopedia

lp:~widelands-dev/widelands/fix_encyclopedia has no merge proposals.