Merge remote-tracking branch 'upstream/master'

Conflicts:
	tools/upgrade.sh
Merge branch 'master' of github.com:twleung/oh-my-zsh