Merge branch 'sched'