Merge proposals dependent on lp://qastaging/~aauzi/midori/fix-1006629

lp://qastaging/~aauzi/midori/fix-1006629 has no merge proposals.