Update GitLab repo to current state on the climexp server

Merged Alexander van Heukelum (TriOpSys) requested to merge (removed):master into master

Update GitLab repo to current state on the climexp server