Merge upstream/master.