Merge branch 'cb/cvsserver' into maint