This is 2.5
this is 2.6-dev
Fixed an issue with stream wrapping on python 3
Merge branch '2.x-maintenance'