Merge proposals dependent on lp://qastaging/~vanvugt/unity/fix-815454-trunk

lp://qastaging/~vanvugt/unity/fix-815454-trunk has no merge proposals.