Merge branch 'oprofile/core' (early part) into oprofile/perf