Merge proposals dependent on lp://qastaging/~xanderfomin/midori/fix-bug1258849

lp://qastaging/~xanderfomin/midori/fix-bug1258849 has no merge proposals.