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