Merge branch 'sg/bash-completion'