Merge branch 'jc/cvsserver-perm-bit-fix' into maint