Merge branch 'master' of gitlab.mpcdf.mpg.de:ipphinde/test_gitlabCI

1 job for master in 0 seconds (queued for 2 seconds)