Merge branch 'net-2.6.25'