Merge pull request #2281 from commodo/python-setuptools-upgrade