Merge branch 'oprofile/urgent' into oprofile/core