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

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