Adding a little more context help.
Merge branch 'master' into v6-lsp
Fixing up history section.