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

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