Safer check for existence of zsh plugins.
Merge branch 'master' into x