Merge branch 'master'; commit 'v2.6.39-rc3' into next