Merge r258187 from head.

Approved by:	re@ (delphij)
Approved by:	davidch (mentor)