Merged upstream/master.