Submitted by: Pierre Delaage (cherry picked from commit a006fef7) Resolved conflicts: crypto/bio/bss_dgram.c ssl/d1_lib.c util/pl/VC-32.pl