Merge branch 'for-2.6.30' into for-2.6.31