Merge proposals dependent on lp:maria/5.5

lp:maria/5.5 has no merge proposals.