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

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