Reviewed-by: Kurt Roeckx <kurt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/2317)
Reviewed-by: Richard Levitte <levitte@openssl.org> GH: #1770