Merge branch 'master' into feature-zsh-completion
Update zsh completion file
Update bash completion file
Merge branch 'feature-bash-completion' into release-1.2
Merge branch 'feature-zsh-completion' into release-1.2