Don't reimport things
Merge branch 'master' into bundle-python-dep