Merge 'upstream/master'
Merge 'master' of github.com:devin-c/oh-my-zsh