Merge pull request #2136 from reaperhulk/encode-othername

Encode othername