Merged commits from upstream to oh-my-zsh fork