saml encryption
Merge remote-tracking branch 'upstream/master'
Merge pull request #771 from patriot1burke/master

saml encryption