Explicitly set extended_glob in zshrc
Merge branch 'master' into osx