Merge commit 'v2.6.35-rc1' into for-2.6.36