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

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