x509 changes for 0.9.8e support
Merge pull request #758 from reaperhulk/x509-098e

x509 changes for 0.9.8e support
Merge branch 'master' into compiler-warnings-error