Merge in changes from upstream.