Merge commit 'v2.6.36-rc5' into sched/core