Py26 test fixen.
Screw it, removing the silly broken test.
Merge branch 'master' into join
localize the timeout