Merge commit 'v2.6.39-rc4' into next