Merge proposals dependent on lp:~kalikiana/midori/fix1200960

lp:~kalikiana/midori/fix1200960 has no merge proposals.