Merge proposals dependent on lp:~maria-captains/maria/trunk

lp:~maria-captains/maria/trunk has no merge proposals.