Merge branch 'tduehr/gitlab-ce-cas-support'