Merge r256299 from head.

Approved by:	re@ (gjb)
Approved by:	davidch (mentor)
Merge r256280 from head.

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