Log Message: Add a fix for SA36540 (SSL certificate spoofing vulnerability) taken from the source repository.