Merge reason: Pick up fixes and move base from -rc1 to -rc5.
Signed-off-by: NIngo Molnar <mingo@elte.hu>