Merge branch 'bw/cvsimport' into next