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