Merge proposals dependent on lp://qastaging/~foxoman/unity/fix-for-bug-924354

lp://qastaging/~foxoman/unity/fix-for-bug-924354 has no merge proposals.