Merge in build trunk.