Merge branch 'rr/cvsexportcommit'