Merge pull request #1864 from rubenk/python-2.6