Merge branches 'sched/urgent' and 'sched/rt' into sched/devel