Merge proposals dependent on lp:~daniel-wyatt/nautilus/fix-bug1164016

lp:~daniel-wyatt/nautilus/fix-bug1164016 has no merge proposals.