Punycode decoding fails if encoded string has not hyphen
Merge branch 'hotfix/4634'

Close #4634
Merge pull request #4636 from fetus-hina/punycode

Punycode decoding fails if encoded string has not hyphen
Merge branch 'hotfix/4636' into develop

Forward port #4636