Merge remote branch 'tip/perf/urgent' into oprofile/urgent