Merge branch 'jc/prompt-document-ps1-state-separator' into maint