Mir

Merge proposals dependent on lp://qastaging/~alan-griffiths/mir/keep-helgrind-happy

lp://qastaging/~alan-griffiths/mir/keep-helgrind-happy has no merge proposals.