Merge branch 'OpenSSL_1_0_2-stable' of git.openssl.org:openssl into OpenSSL_1_0_2-stable Reviewed-by: Dr. Stephen Henson <steve@openssl.org>