Merges upstream.