Merge proposals dependent on lp:mae

lp:mae has no merge proposals.