Merge with trunk.