Upgrade for Python 3.2 plus bugfixes