Merge branch 'ma/bash-completion-leaking-x' into maint