Added CAS2+SAML1 support