Merge branch 'sg/bash-prompt'