Merge commit 'v2.6.39-rc3' into for-2.6.39