Merge the upstream changes of oh-my-zsh.