Merge commit 'v2.6.37-rc1' into for-2.6.37