Missing commits for 0.7.1 Python 3 compatibility