Merge branch 'mt/zsh-completion-optim'