Merge branch 'for-2.6.36' into for-2.6.37