Merge branch 'jc/test-cvs-no-init-in-existing-dir'