Merge pull request #2085 from alex/encode-san

Initial code to encode SANs