Merge branch 'for-2.6.35' into for-2.6.36