Merge reason: Add fixes before applying dependent patches.
Signed-off-by: NIngo Molnar <mingo@elte.hu>