Merge commit 'v2.6.37-rc6' into for-2.6.38