Merged with latest oh-my-zsh