Merge upstream changes to oh-my-zsh