bug fix for oh-my-zsh
auto merge of #920 : CMGS/cargo/master, r=eerden

when I use this script in oh-my-zsh, it will raise an error, so I modified it..
Merge remote-tracking branch 'upstream/master'