Sync with upstream master.