Merge remote-tracking branch 'cvs/master'