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