Merge pull request #2107 from commodo/python-2-7-11-upgrade