Merge reason: We want to queue up a dependent patch. Also update to
              later -rc's.
Signed-off-by: NIngo Molnar <mingo@elte.hu>