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