Merge pull request #2685 from alex/setuptools-dep

Require a newer setuptools.