Merge branch 's1840' of gimli2:/srv/cadc/git/wopencadc into s1840