Merge branch 'jk/bash-completion'