Mir

Merge proposals dependent on lp:~alan-griffiths/mir/fix-1335747

lp:~alan-griffiths/mir/fix-1335747 has no merge proposals.