Merge proposals dependent on lp://staging/~larsu/nautilus/lp1480217

lp://staging/~larsu/nautilus/lp1480217 has no merge proposals.