Fix zsh plugins check.
Merge branch 'master' into x