Merge proposals dependent on lp:widelands/build16

lp:widelands/build16 has no merge proposals.