Merge branch 'for-2.6.40' into for-2.6.41