Merge commit 'v2.6.30-rc6' into perfcounters/core