Merge branch 'jk/cvsimport-quoting'