Merge in Upstream Changes