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

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