Merge branch 'jc/cvsimport'