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