Adding update of setuptools
Merge branch 'master' into vanilla