Merge with build trunk.