Updates from all sources, and a new merge.