Merge proposals dependent on lp:~midori/midori/fixExtraWarnings

lp:~midori/midori/fixExtraWarnings has no merge proposals.