Update from trunk.