Merge reason: pull in latest to fix a bug in it.
Signed-off-by: NIngo Molnar <mingo@elte.hu>