Merge branch 'js/cvsexportcommit'