Py3k fix.
Automated merge for py3k testing