Merge build trunk.