* Sync up to trunk head (r60691).