Update from W3 CVS.