Merge branch 'master' into for-2.6.35