Merge branch 'sg/bash-prompt-untracked-optim'