Merge pull request #1916 from spbnick/v3.0.x_openssl_1.1_fix_2