Merge branch 'master' of pc18:/srv/git/r/doldaconnect