Merge proposals dependent on lp:~roryj/slingshot/fix-1356641

lp:~roryj/slingshot/fix-1356641 has no merge proposals.