Merge branch 'bw/cvsimport'