Merge pull request #921 from TheBlueMatt/2021-05-no-control-chars