dee

Merge proposals dependent on lp://qastaging/~mvo/dee/small-python-fixes

lp://qastaging/~mvo/dee/small-python-fixes has no merge proposals.