Merge proposals dependent on lp://qastaging/~gordallott/unity/fix-937421

lp://qastaging/~gordallott/unity/fix-937421 has no merge proposals.