Merged upstream master.