Merge proposals dependent on lp:~david4dev/slingshot/fix-804518

lp:~david4dev/slingshot/fix-804518 has no merge proposals.