Merge remote-tracking branch 'tip/perf/urgent' into perf/core

Merge branch 'perf/urgent' into perf/core, to pick up fixes

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