Merge pull request #1425 from jbertram/master

Document SSL options
Fix authors