Merge branch 'devel-for-2.6.31' into for-2.6.31