* Sync up to trunk HEAD (r62286).