Merge commit 'v2.6.29-rc1' into core/urgent