Dependent merge proposals : trunk : Code : Picsaw

Merge proposals dependent on lp://staging/picsaw

lp://staging/picsaw has no merge proposals.