Merge reason: Merge upstream commits to avoid conflicts in upcoming patches.
Signed-off-by: NIngo Molnar <mingo@elte.hu>