Merge reason: We want to apply a dependent patch.
Signed-off-by: NIngo Molnar <mingo@elte.hu>