* Sync up to trunk head (r64894).