Merge branch 'pm/cvs-environ'