Merge pull request #2282 from commodo/python3-setuptools-upgrade