Merge branch 'mw/bash-prompt-show-untracked-config'