Merge remote-tracking branch 'cvs-www/master' into www