Merge commit 'v2.6.39-rc1' into perf/urgent