Merge proposals dependent on lp://qastaging/~testing-cabal/treeshape/trunk

lp://qastaging/~testing-cabal/treeshape/trunk has no merge proposals.