Merge proposals dependent on lp://staging/~macslow/unity/unity.fix-929425

lp://staging/~macslow/unity/unity.fix-929425 has no merge proposals.