Merge branch 'master' into net-2.6.25