Merge branch 'sg/bash-prompt-dirty-orphan' into maint