Mir

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

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