Update GitLab repository to the current state

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

Merge changes on the climexp server into the gitlab repository.