Update for support of Python 2.6