Merge proposals dependent on lp://qastaging/~hansvschoot/unity/trunk

lp://qastaging/~hansvschoot/unity/trunk has no merge proposals.