Merge branch 'mg/cvsimport'