Update upstream.

Update upstream but ignore changes that don't apply to the original.