Merge from upstream.