Merge proposals dependent on lp://staging/~threeve/ubuntuone-ios-files/trunk

lp://staging/~threeve/ubuntuone-ios-files/trunk has no merge proposals.