Merge upstream update.