Merge branch 'aw/cvs'