Josh Cummings 9c0a35a6f6 Merge branch '5.8.x' into 6.0.x %!s(int64=2) %!d(string=hai) anos
..
saml2-service-provider 9c0a35a6f6 Merge branch '5.8.x' into 6.0.x %!s(int64=2) %!d(string=hai) anos