Merge remote-tracking branch 'schmonz/cvs'