* Sync up to trunk r55544.