Merge reason: the branch was on pre-rc1 .30, update to latest.
Signed-off-by: NIngo Molnar <mingo@elte.hu>