Merge branch 'ds/cvsexportcommit-force-text'