Merge branch 'gp/maint-cvsserver' into maint