Merge branch 'jk/maint-cvsimport-fix' into maint