Merge branch 'mo/cvsserver' into next