Merge from build trunk.