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