Merge reason: this branch was on a .30-rc2 base - sync it up with
              all the latest fixes.
Signed-off-by: NIngo Molnar <mingo@elte.hu>