Merge branch 'jk/maint-cvsimport-pathname'