Merge branch 'rr/cvsexport'