Merge proposals dependent on lp://staging/~ubuntuone-hackers/convoy/trunk

lp://staging/~ubuntuone-hackers/convoy/trunk has no merge proposals.