Merge changes from upstream.