Merge commit 'v2.6.26' into sched/devel