Merge branch 'perf/urgent' into perf/core

Merge Reason: to pick the fix:

 commit e7f01d1e
     perf tools: Use scnprintf where applicable

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>