Merge branch 'net-sched-fixes'