Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of https://github.com/its-dirg/pyoidc
Merge branch 'master' of https://github.com/its-dirg/pyoidc
Updated documentation of pyoidc OP to include setup of multi auth.
Merge branch 'develop'