Merge latest changes from upstream.