Syncing with SVN (r658).