Merge from trunk.