Merge branch 'for-2.6.38' into for-2.6.39