Merge branch 'gh/cvsimport-user'