Reviewed-by: Andy Polyakov <appro@openssl.org> (Merged from https://github.com/openssl/openssl/pull/4875)
Submitted by: Yoram Meroz <yoram@mail.idrive.com> Reviewed by: <appro>