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