Merge proposals dependent on lp:~superscript18/scratch/fix-1013421

lp:~superscript18/scratch/fix-1013421 has no merge proposals.