Merge proposals dependent on lp://staging/~voldyman/slingshot/fix-1199903

lp://staging/~voldyman/slingshot/fix-1199903 has no merge proposals.