Merge proposals dependent on lp://staging/~mandel/wadlsharp/fix-641205

lp://staging/~mandel/wadlsharp/fix-641205 has no merge proposals.