Merge proposals dependent on lp://staging/~vanvugt/unity/fix-1036528

lp://staging/~vanvugt/unity/fix-1036528 has no merge proposals.