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

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