Merge proposals dependent on lp://staging/~mandel/wadlsharp/fix_643401

lp://staging/~mandel/wadlsharp/fix_643401 has no merge proposals.