* Sync with recent trunk (r52637).