Merge "openssl-1.0.1d upgrade"