Python 3 fixes
Merge branch 'master' of https://github.com/zodb/relstorage