Merge commit 'v2.6.33-rc2' into for-2.6.33