Update distribute_setup to latest version
Merge branch 'master' into dev