Merge branch 'fc/zsh-completion'