Merge in the latest changes.