Update setuptools
Merge branch 'dev'