Merge oh-my-zsh upstream