Josh Cummings 46a40e7b38 Merge branch '6.0.x' 2 gadi atpakaļ
..
saml2-service-provider 46a40e7b38 Merge branch '6.0.x' 2 gadi atpakaļ