Merge branch 'mcatanzaro/tls-docs' into 'master'