Mir

Merge proposals dependent on lp:~andreas-pokorny/mir/fix-1536279

lp:~andreas-pokorny/mir/fix-1536279 has no merge proposals.