Merge updates from trunk.