Merge pull request #940 from TheBlueMatt/2021-06-fix-docs