Merge commit 'v2.6.32-rc7' into perf/core