Merge proposals dependent on lp:~niclasl/scratch/fix-1351611

lp:~niclasl/scratch/fix-1351611 has no merge proposals.