incorporate fixes from issue 3162; SSL doc patch
3 files changed