Merge reason: both topics are ready now, and we want to merge dependent
              changes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>