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

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