Applying SF Patch #3485177 submitted by ncrouther. This should resolve SF Bug #3306847.
Applying SF Patch #3485177 submitted by ncrouther. This should resolve SF Bug #3306847.

grangeway/openssl-net,grangeway/openssl-net,marcominetti/openssl-net