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