Please review the attached patch which addresses the following PKI TRAC Ticket:

Detailed testing instructions for this patch are documented within the TRAC Ticket.

CAVEATS: