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