Merge pull request #2150 from reaperhulk/encode-uri

support URI general name encoding