Merge branch 's6000' into for-2.6.31