dee

Merge proposals dependent on lp://staging/~charlesk/dee/fix-904995

lp://staging/~charlesk/dee/fix-904995 has no merge proposals.