Merge branch 'yaz-770' of ssh://git.indexdata.com/home/git/pub/yaz into yaz-770