Merge remote branch 'cvs/master'