Merge reason: pick up the latest fixes - they won't make v3.0.
Signed-off-by: NIngo Molnar <mingo@elte.hu>