-merge branch 'master' into identity_oidc
authorPhil <phil.buschmann@tum.de>
Mon, 22 Jan 2018 13:56:59 +0000 (14:56 +0100)
committerPhil <phil.buschmann@tum.de>
Mon, 22 Jan 2018 13:56:59 +0000 (14:56 +0100)

Trivial merge