New branch for compatibility with Python 2.6.6