Merge branch 'sched/core' into sched/urgent, to pick up fix