* Sync up to trunk head (r65426).