Merge proposals dependent on lp:yarock/trunk

lp:yarock/trunk has no merge proposals.