Fix for latest setuptools
Merge pull request #2182 from dstufft/fix-latest-setuptools

Fix for latest setuptools