Merge changes with upstream master.