Merge in official changes.