Merge commit 'v2.6.38-rc3' into next