Upgrade bootstrap.py to new version