Nautilus

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

  1. fix-bug1164016
  2. Dependent merge proposals

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