Merge branch 's1132' of /srv/cadc/git/wopencadc into megarelease