Land latest TJ's patch for ssl options