Merging with upstream master.