Merge proposals dependent on lp://staging/~cimi/unity8/fix-1589060

lp://staging/~cimi/unity8/fix-1589060 has no merge proposals.