Merge in HEAD build changes.