pkg_resources test
Merge branch 'master' into extern-darwin