Fix for py3k.
Merge branch 'master' into raiser