Merge branches 'oprofile/fixes', 'oprofile/next' and 'oprofile/master' into oprofile/auto