Merge in build trunk work.