Sync with trunk.