Merge proposals dependent on lp://staging/~tintou/pantheon-files/fix-1270091

lp://staging/~tintou/pantheon-files/fix-1270091 has no merge proposals.