Merge branch 'jk/cvsimport-does-not-work-with-cvsps3' into maint