python2.5 fix
Merge branch '2_10'
Merge branch 'master' into async