Merge commit 'v2.6.32-rc6' into next