Merge branch 'mo/cvs-server-updates'