Merge proposals dependent on lp:~dr3mro/nautilus/fix-1164016

lp:~dr3mro/nautilus/fix-1164016 has no merge proposals.