Merge proposals dependent on lp:~christriant/scratch/fix-1258291

lp:~christriant/scratch/fix-1258291 has no merge proposals.