Merge upstream/master in.