Merge branch 'setuptools'