Merge pull request #8302 from annando/allowed-chars