Merge branch 'tr/maint-1.6.5-bash-prompt-show-submodule-changes' into maint-1.6.5