Merge commit from original oh-my-zsh 

Merge commit from original oh-my-zsh