Fixes for Python 2.6
Merge branch 'auth-test-fix' into devel