Merge proposals dependent on lp:~ter0/scratch/fix-1097690

lp:~ter0/scratch/fix-1097690 has no merge proposals.