Merge branch 'identity_oidc'
authorSchanzenbach, Martin <martin.schanzenbach@aisec.fraunhofer.de>
Thu, 1 Mar 2018 13:14:01 +0000 (14:14 +0100)
committerSchanzenbach, Martin <martin.schanzenbach@aisec.fraunhofer.de>
Thu, 1 Mar 2018 13:14:01 +0000 (14:14 +0100)

Trivial merge