Merged. (Please reopen if you think we should also follow up in the other direction.) -- Ticket here: http://rt.openssl.org/Ticket/Display.html?id=4393 Please log in as guest with password guest if prompted