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