Merge pull request #2108 from mail-in-a-box/master

support othername in general names