Code

Merge branch 'am/completion-zsh-fix'