Merge tag 'v3.7-rc5' into sched/core