Merge commit 'v2.6.34-rc2' into for-2.6.34