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