inital commit for upgrade
Merge branch 'master' into origin-update

Conflicts:
	compute.py
use run cmd and upgrade
clean and make upgrade go
Merge remote-tracking branch 'refs/remotes/origin/update'