https://issues.shibboleth.net/jira/browse/SSPCPP-606

git-svn-id: https://svn.shibboleth.net/cpp-sp@3887 cb58f699-b61c-0410-a6fe-9272a202ed29