Merge proposals dependent on lp:~popara/chop/trunk

lp:~popara/chop/trunk has no merge proposals.