Merge 3.2 build_ssl changes.