Merge pull request #950 from TheBlueMatt/2021-06-changelog