Merge proposals dependent on lp:~darcy-develin/scratch/upstream-fix-1038291

lp:~darcy-develin/scratch/upstream-fix-1038291 has no merge proposals.