Merge reason: pull in latest, to be able to revert a patch there.
Signed-off-by: NIngo Molnar <mingo@elte.hu>