Merge remote-tracking branch 'alex/bug162-SSLCipherList'